tests: Fix borders test

Bad merge

https://bugzilla.gnome.org/show_bug.cgi?id=680801

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 0e27058c5df259d449ddeaa8c0766d99d5272438..97d049d50d902122be89fda6704e011356a3262c 100644 (file)
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -84,7 +84,6 @@ function test() {
     function addGradientCase(direction, borderWidth, borderRadius, extra) {
         let gradientBox = new St.BoxLayout({ style_class: 'background-gradient',
                                              style: 'border: ' + borderWidth + 'px solid #8b0000;'
->>>>>>> 2aff593... tests: Run each test in a function
                                              + 'border-radius: ' + borderRadius + 'px;'
                                              + 'background-gradient-direction: ' + direction + ';'
                                              + 'width: 32px;'